[FIX] several minor fixes

 * mostly related to #736 and #721


fixes #736