Fixes

Should fix #877