Fixes to finish manual installation