Some maintenance fixes