[Some Fixes]