Master: Fix build issues and deployment target