Small changes.
Merge pull request #730 from jfarid27/140415-fix-issues

Small changes.