Build fixes for RTE