couple fixes related to #65