Bug fixes. Daily check in