Fixing some errors

couple errors were fixed in master. pushing to develop.