FIX: minor changes