Small improvements and fixes on interpreter