Fix bugs in relation to wiki

^ title + commits! :tiger: