Some fixes and minor updates