011: again some bug fixes