Fixes for bulk get
Misc fixes