Fixes on referencies