Merge branch 'trivial-fixes' of https://github.com/agimenez/bti into agimenez-trivial...