Some fixes after testing