Several Minor Fixes to Core Components