Fixed @NotNull annotation warnings