Fixed bugs blocking compilation.