Fix some things broken by merging master branch