Update dependencies and trim the fat
Update special case for property names (should have been part of commit 0fb444b)