Fixing issues with instances