Fixing code issues..