Minion changes and S1 fix