Marmoset: ERROR FIXES

Just a few fixes for some bugs found.