Fixed small issues with chris