Resolve some margin problems