Adding some fixes for Aniyia