Fix compliation errors