Internal Fixes