Some fixes or whatever