Small positioning fixes