Some more Master fixes.