Try to fix things left out from previous commit