More fixes

As discussed on IRC with @skurfer and @tiennou