Fixes for "Forced" flag commit