Small fix and add moc