Minor maintenance changes