Fixing up install logic