Some masterless fixes.