Some fixes, etc.