SP modular renderer: more commits done towards fixing it.