Cleanup/add missing stuff