Updates for spm8 on brutus.