Fixes for frontpage wiki

Fixes #646 and #696