bug fixes 5.1 drafted