Entry fixes