Added fixes for integration on ddk2 rc1