fixing some hard to find issues