Install fixes

more fixes based on my experience