Some smaller maintenance changes