Hot design fixes