Fixing build breakage