Fix of some minor autolayout issues