More minor changes based on PR