Some fixes, additions, etc.