Further attempts to fix compile