Minor fixes for v1.4.0