EYA bug fixes

EYA fixes #34