Addressing some issues