Fix master breakage