Some little enhancements