Minor improvements in copilation process