Fixing Akavache issues