more fixes for compatiblity with Havana
Merge pull request #28 from markmcclain/havana

more fixes for compatiblity with Havana