0.9.26 couple of enhancements