s6 small fixes