Some fixes and rename