Minor changes and implementations