fixing some inconsistencies in schema