Fix ARC issues and fix a few bugs with the new properties