Common PropertyLoader & Minor Fixxes