Fixed last bugs.