more namespace fixes for 1.3.6