Backport fixes

Backports for fixes to the Visible/Reduced credit checkboxs always being checked bug and the tikz option bug.