Bug fixes 60,62,63,64,65,66