Sizing fixes for MBP