Several maintenance updates