last minute fixes and checks