Additional various fixes ;)