few fixes to make shell script work