Dealt with some seen/familiar/known issues.