Moved the fixes into the .ts file