Fix build/compile errors