Patch 3.14 Compatibility; minor fixes