Fixing some more props