Fix issues 764 761

Unstable version fixes for #761 and #762.