Resolves outstanding issues