Some fixes we need