Work towards debugging issues