Made install order more sensible