Resolve a couple issues