Nonnull added, warnings removed