last of prod fixes