Minor strictness tweaks