Fixed minor bugs with communication