Fixes failing builds