More fixes - @robingall2910