more last minute fixes