More warning and build fixes