Tweaks needed to get things compiling