slight conditional fixes