Minor changes for easier deployment on my setup