Added JustArchi optimization patches