Fixes for inquiries