fix some compilation issues due to last merge