AP Corrections as documented in JIRA ticket.

Corrections made per JIRA ticket: https://jirasul.stanford.edu/jira/browse/FRDA-257