another batch for fixes