Minor fixes, improvements, etc.