Fixed some chanes