Revamp fixes