Fixed things to get it all running