Fix bugs for Wiki