Working bot fixes