Fixed a few post-rebase bugs