Fixes from review and brokeness