Minor updates, warning fixes, etc.