Fixes problems with the master merge