Fixing @preconditions and @NotNull annotations