patches from SPACEBAT