Some positioning fixes