Minor tweaks to get it compiling again