More work on issues