chinook: minor tweaks