Fixes for bean editing.