some fixes for interpreter issues?