Small fixes to make properties parsing fancier