Fixes for beta 4.