Last of the 1.5.1 changes.

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