Various fixed, requested by @ivan-basekit via email