some tweaks to get things working