Fixes for beta6.