Mainly small changes for  testing/CI