finbug warnings fixes