[misc] minor fixes