A few more changes to better parse answers