more 1.8 fixes
Merge pull request #191 from arthurnn/fix_test_18_1

more 1.8 fixes