[misc] some more tweaks to the last few changes