Adhoc fixes