misc warning/error fixes