Ruby 1.8 fixes
Don't force us to use duck punch