Fix minimal errors