Fixing issues...