Fixes for Reference field