- couple fixes