More firstof fixes