Few compiler enhancement