FIX: Building issues