Minor enhancements to current code