Minor bug fixes in interpreter