Changes and tweaks for Hakim