Tagged: fixes for errors