1.2.6 minor improvements - no weinre