Fixes

A couple of fixes, including one for #13