Fixed installation mostly, hopefully.