Major fixes to the software packages