Fix: compile errors