Fix some issues with positioning