Fixes
Add few missing stuffs