Fixes for beta