Some blocker Fixes