Small fixes for v1.5 release