Some more fixes on RE