Fixes suggested by Brandon