Some fix around the core, app and vars