Dealt with some warnings