Resolving setup issues