Other compilation fixes