Fixes for Linux compilation