Fixes after beta test 1