Fixed various problems - beta mode