Fixes for FC043