fixed some remaining namespace problems with 1.3.6 target