Scukerman's fixes