Fixed some unresolved references