Minor changes to maintain keg and tap state better