Miscellancelous rebase artifacts