Minor fixes
Minor fixes

ducthanh/aruba,maxmeyer/aruba,jasnow/aruba,AdrieanKhisbe/aruba,dg-ratiodata/aruba,AdrieanKhisbe/aruba,mvz/aruba,ducthanh/aruba,mvz/aruba,jasnow/aruba,cucumber/aruba,AdrieanKhisbe/aruba,dg-ratiodata/aruba,dg-ratiodata/aruba,jasnow/aruba,ducthanh/aruba,dg-ratiodata/aruba,maxmeyer/aruba,AdrieanKhisbe/aruba,ducthanh/aruba,jasnow/aruba