Fixed last bugs