Fixes to CWM creator script