@Freydal
Fixing additional build issues
49984ec