Patch of fixes for bugs and oversights

Same mistake, will fix.