Fixed issues in form A import