Minor improvements in ABc build