O: some fixes