Fix Curlybear stuff...