Minor enhancements with arguments