more app_builder fixes