beta-4 fixes