Fixed some resolution errors