Fixes for v1.5.3

See associated issues for fixes in this PR