Merge "Minor fixes for linux compatabilty"