Neocomplete fixes