more fixes to akavache issue