Reset variabls that could cause a buffer switch after changing buffers, refs #143