sync small differences with kodiak-devel branch