fix some blockers and some future/potential blockers