Some fixes and details