Fixed and Enhancements