Minor fixes, updates