Fixed compilations and set proper overrides