Minor changes to get things working again