Fixes. Should move to bitbucket