Dirty fixes for linux and proprietary code.