fixes in common script