another few fixes