Minor tweaks, begin preparation for 1.8 update