Fixed issues with disutils and program