Fixing the issues