Fixes from my mad commit rush!