Minor improvements
Fix