spmjs fixes