Fixes

closes #551