Fix frame location issues