In app fixes and improvements, batch2

Second batch of fixes and improvements to storage-client

@tejohnso please review