Fixes for remaining observed resolution problems.