Fixes to previous commit (which was done by mistake).