Fixing issues....