Improve installation scripts