Fixing issues..