Fixes for FlatUIKit