Fixed build issues introduced with merging Master into ChocoButter