misc; no functional changes