tweaks getting this to compile for redist