Fix some more issues

I'm not sure I follow this comment