Fixed two bugs
Merge pull request #522 from dswd/webfixes

Fixed two bugs