Fixes problems introduced in the master merge