FIX: minor fixes