oops, missed a few conversions