Fixing mixup with housing changes