Small changes after beta testing