Platform adjustments

Clean up properties
Upgrade lib versions
Factory fixes