More misc. fixes

Just stepping through the errors the interpreter is throwing out.