More fixes - @robingall2910
Merge origin/master