Fixes for layoutSubviews