Some changes from coder exports