Fixes compilation failures