Migrate qpool home to bootstrap
Misc fixes