Fix bugs related to the prop creation system