Fixes from Bitbucket transfer.