Fixes for beta4