1st set of fixes for the 1.5 update.

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