Some Fixes ...