changes required to get things compiling again