Build fixes + Installation routine