fix ups
sync some older patches