Fixes for D-SPCA: q=0 works, q>0 still doesn't