Definition & App fixes