Some fixes again