Added a few patches #mxpx #sfh