Fix app-core