Some more fixes for installation procedure