Fixed some stuff in interpreter