Patch of fixes for bugs and oversights

Awwwww no more scalpel of doom.