Small changes. Maybe fix build issues?