a couple fixes