(Wiki) Some bug fixes