Remove coerceEntry, fix a few bugs.