Window builder compatibility added (very minor changes)