Fixes for Autolayout wonkyness