Stweaks support + fix merge errors