bugfixes for the linux version