katsa's fixes