Fixes for beta 6