Engine fix

void* replaced by typed pointer for safety and style