Porting KroozSD: some more changes