Minor fixes: more unity