A few little changes to get things working