Fix some issues with eigenstate computation