Added better gcc diagnostics