Fixed all errors from the broken commit due to size restraints manually