Some fixes for Beta2