Fixed properties that got messed up by arthur
Merge origin/master