Fixed Coms bugs