Fix out of the box issues