Fixed last few out-of-box issues