Fixes in Rhodes repository for EB 1.1