Minor maintenance updates, no functional changes
