couple of updates towards 1.6.2 compat