CHANGED: Fixed build issues