Fixed some bugs with entry creation.