Fix AppHelpers