Additional positioning fixes