Fixing installation bugs...