Slight Fixes