minor hotfixes for Linux support