Basic porting to 1.7