FIX: minor bugs