Minor changes to try to get things working