Switch to uname -s; hopefully better