Last minor changes for install issues