More lakka fixes