fix up some issues that can arise