Some Logical Fixes