Remove -w s and fix so it compiles without warnings.