charm: minor fixes for review