[Performance] Fix Nil Pointer Exception and other misc package update…

[Performance] Fix Nil Pointer Exception and other misc package update… #13