Fixes for beta 5