Fixes for Linux compilation, small changes