Add jsr305, couple of @Nullable annotations