Updated to use latest versions of various modules.