removing more byte references.
Bug fixes