Restored some fixes