couple fixes