a few more replacement, compile seccesefully