fixes related to #819