Tweaks to modernize