tweaks to get running on F19