Various upgrades (scaled registration, etc.)