Fix types; Compiles with strictest flags