Fix compile warnings (BETA)