Fixes compilation issues after the latest changes