Various fixes to interact.cpp