o Some fixes