More conditional fixes