Some fixes and other things