Fixes for Linux and minor typos