Remove base.reemit
Fix some signatures