Bugs from branch merging quashed, hopefully