Fixed minor errors blocking compilation