Restrict Build.SERIAL, simplifications

Thanks @Tungstwenty