checkout master bugfixes