minor references improvements