Small Fixes
More Small Fixes