fixes for our frameworks_base