Message fixing bugs