Sasha wishes fixes