Fixes for beta 6 - holy jeeze