Fixes ready for beta 2