Bug fixes for v1.2.6