General fixes, etc.