Fixes after the #269 changes