App actually runs with these changes.