Less compiler warnings