small fixes in s5