trivial changes from @spitters