Fix errors that occured during commit history rewrite

Signed-off-by: Mattias Andrée <maandree@operamail.com>