Fixed the last bugs.