Errors and warnings resolved