Fix last minute bugs.
Fix last minute bugs.