Fixing more AutoLayout issues.