Fixes for new master