Fixes for Linux, refs ticket #13 @45m