Fixes build issues