Minor stuff + use installation destination variables.