Cleaned up some resolution issues