Fixed more changes