Fixes for v1.4.0

Minor fixes