Fixes

These fix the two bugs reported on the forum. Please pull!