Fixed build for abc