Finish work on 7.7