More debugging to get latest versions running