Two Small Fixes