Minor fixes for Linux platform