Miscellaneous tweaks to objectives