Linux fixes for #204