A few a23 script updates