base changes needed to compile for v2 beta 4