FIX: compiler errors