resolve errors and warnings