References fixes for framework