Important security fixes. Addresses issues #1 and #2