misc last minute fixes