Fixed a few bugs to make hybrid run correctly.