Last minute quick fixes