Additional logical fixes