Fixed bugs that resulted from move