More cleanup for strict build flags