Kingdom responsive fixes