Slight enhancements