Some fixes for wiki module