minor enhancements for better interop