Warning fixes, etc.