Fixed incorrect call to InstallHandler and a few other things
6 files changed