Fixes for CMock