Fixing misc todo's