Improved installation routines