2.0 beta quick fixes