Fixed build issues with PR#45