last-minute bug fixes