Minor code enhancements