Partial 10.36 support, also fix #499