Miki fixes