Fix some positioning issues.