Few 1.5.1 Fixes.

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