Fixed 1.7 specific issues