Commit: Fixed bugs