Maintenance fixes