basic fixes for new jeo