Fixes for bloof & Guis