Fixes build problems