Allow setting of various variable caps (fixes GH-1086)