Minor fixes
Quick fix