Clobber Barons: 11/14 patch fix

Small patches and fixes