Added const to char * args where possible