Fix bugs introduced (with packaged apps)