Fixes 74,75,79 and 80