Fixes compilation issues