Several small fixes here and there
Cooperation with community