Fix dummy bugs