More minor modifications