last min fixes