Minor updates to investigate and try and improve runtime performance