More purchase fixes