Small maintenance updates