Code review - issues marked with XXX