Support Unix systems a bit better