More bitbucket fixes