Fixing last blocker bugs