Positioning fixes (#248)