Fixes for 'base' as key and bad response