FIX: some minor fixes based on tests