fixes for entries and deploy