warning/error fixes