Final fixes for create package script