Some Basic Fixes