Fixed some cases with positioning.