app fixes from merge