Some more positioning fixes.