Merged several core packages. Warning cleanup.