Some last minute bug fixes from the night crew