Added fixed things since RC release