Fixed errors caused by renaming of Shot to Square