Small changes to make it compilable.