misc fixes. cotaier inline