Tags and  appropriate fixes