A few more flexy fix ups