Small freebase improvements