Minor fixes for Linux building