Lint configuration
Data inconsistency bug fixes