Fix less-compiler errors catching