More compatibility fixes

Should fix #32