Small changes for UIBuilder.