Fixed some unresolved stuff