Fixed all Legacy errors due to irritating