more tweaks to get this to compile