Carrying over fixes from dev.