Some interpreter enhancements