Code fixes for install