Our fixes