Fixes for C6