add a couple of fixes after adding upcoming feature