Internal Project Changes and bug fixes