Changes before thurs shutdown.
Fix for merge..