Corrected several issues/changes to make things work with latest versions of the required software