more fixes for rtmes