minor tweaks to get it working again