bug fix while testing juno

fixes are common for juno and icehouse though icehouse will work even without them