Installation Fixes