Switch to 1.6.4 Gradle build.  Fix Container crash bugs.  This took entirely too long.