minor fixes - no functional change