First batch of Spoutcraft 1.5.2 fixes.

Signed-off-by: Mike Howe <dockter@almuramc.com>