Cleared remaining issues