Got rid of some warnings, errors and still there.