Fix dummy issues