minor bug fixes 2