Some fixes and work