- Some fixes and improvements