Added scouting app fixes