Bug fixes for v1.5.1 release