Few more places we need to move to byte strings