Fixed minor bugs to move to V 1.74