Fix bugs on s6