Fixing bugs from Roza