Update dependencies
Enable Flatten on a per-user basis for now
Code tweaks