Fix problems with master branch