Fixes for Linux OS