More Constant Fixes