Fixing More Issues