Minor updates to internals.