[Core,Applications] Fix minor bugs