Fixes in Rhodes Repository for EB 1.1