Couple more fixes to bootstrap, removing aliases