Various appdata fixes and improvements