greatly reduce number of warnings on Linux - #50