Small maintenance fixes