Fixes issues with interpreter and a few other small things