bugfixes in commonsapi