Minor fixes to positioning