Small updates to keep pace with App integration development