FIX: minor issues