More s5b fixes