Some fixes again and again