Minor fixes and checks for Bob