Mirror from bitbucket + fixes