Beta

Post beta test fixes