Try to fix build problems with last commit