Fixes for Beta4