Minor tweaks w.r.t. colour+size