Fix (some) compile errors