Fixes

On the mend