improve compilation speed
missed some
missed more