Fixed installation bugs