Sigh, new app ID because of HRD... other minor fixes