Fix couple of mod bugs