Finish getting 1.5.2 version working