Fix empty entries