Merged from Carl's code - installation specific changes