Start of fixes for interaction start