Fixes

Here are two small time-savers.