Restore removed fixes