Another minor bug fixes 3