Install fixes