more fixes for aggressive compilation