Fixed issues after beta 7