#33 - manual fixes to EP address fields