Fixing the Issues