Some model interfaces fixes

I am really inclined to add a Sphinx builder just so we can linkcheck.